Changed file structure
removed old tick handlers