Reorganized everything
Merge branch 'reorganizing-code'