Cleaning up project to get it ready for actual development