Renaming modules
Fixing more of renaming refactor and enabling signin and signup
Resolving merge