Simplified namespace, and removed unused file