Moved files around, fixed comment orphans