Move files around to simplify namespacing
Remove unintended spaces