Moved messages in to a separate folder and updated javascript namespaces