Updated namespace name. Removed unused files