refactored project hierarchy.
Cleaning house for fresh slate.