Cleaning up project structure.
12 files changed