Massive Changes !!

I'm Sure the Project is not going to compile for the next century !!! (: