Added to TODO file
Split up big files and did some renaming
Edit TODO