refactor Timer
make spotlight flat
folder restructuring
more folder restructuring