Switch to an image-based system like Smalltalk or hybrid image/file-based system like Common Lisp. Seriously, a lot of the headaches of organization would go away if dev environments were more like Smalltalk.