Added more files
Fixing project structure
Fix main.cpp
Merge branch 'devel_week1'