Moved files around, various bits of linting