Moved files around to declutter the repo