Joelis57

Results 1 issues of Joelis57

Closes #10 and #21 and fixes classes and files being placed in the root folder instead of the proper package.