Re-ordered methods as per guidelines. Renamed namespace and moved files to appropriate location.