Altered file structure to be build and runnable with make