Changed File Structure

Changed the file structure to better match my new file layout as I now
longer use eclipse.

[ticket: 1]