Reorganizing files again
Merge branch 'optimize'