Merge pull request #24 from projectcs13/sprint2.project_structure

Sprint2.project structure