Work on simplfying the mod

I just want to make the mod more compact and easy to read/use by doing my litrle changes continue what you do my changes will never interact your current work... Btw you'll have to change the package declaration on the Id file