Refactor files into namespaces
Broken commmit.