Moved files around for better organization (part 2)