Moved files around and nixed outdated nonsense