Some file structure changes
Merge pull request #10 from JackMarshallHD/Work

Some file structure changes