Fixed folder structure
Merge branch 'master' of https://github.com/kimpe88/school_work
Fixed folder structure