Merge pull request #5 from Vijfhoek/master

Pull master to restructure
Folder restructure!
Updated .gitignores and fixed compilation errors
Merge pull request #6 from Vijfhoek/restructure

Restructured project to work with CMake