threw deps, tracking and utils to new files
forgot 2 quite essential sources