Updated TODOs
Changed file structure. Starting to rewrite the code