Made structure of test folder consistent with that of the src folder.
Merge branch 'master' of https://github.com/Fingerpaint/project-code