Revised directory structure.

Will make sense why this is a good structure later.