Rename & refactor all modules

update namespace