Clean up project structure to prepare for making a proper package