re-org'd the project structure