Re-arrange files for new assignment