Renaming & Refactoring
Rename some modules, fix Features