Moved to one namespace, refactored (no js issues)