Package and Directory Changes

- Moved to a more segregated organizational structure, no content
changes only directory modifications
Merge branch 'josh's-branch'