Massive reorganization. Don't expect namespaces to work...