Updating project structure.

Including code cleanup.