Reorganized project folders for submission.

FINAL COMMIT