Cleaning up project, reordering files.