Cleaning up file structure and setting up build correctly.