Moved around some files so they'd be more organized