Changed file structure
removed old tick handlers
Revert "removed old tick handlers"

This reverts commit 8fe1416cc7145eef185e267358b5b177064505d5.
remove bad code
Revert "Changed file structure"

This reverts commit 3c3df279719ba5a44cbd81dbe72f830635bc4e9a.
Fixed some bugs
Fixed more bugs!! Nearly There!!!