Refactored: JS code organization - try to ann namespaces