Name refactoring, comments, todo, minor code refactoring
Removed class utilites
Emplacement refactoring
Timeline changes (WIP)