Simplify directory structure
Merge pull request #1 from eliotjordan/simplify-directories

Simplify directory structure