Rearranging some folders.
Merge branch 'master' of github.com:ufjschool/ob-s14