Moved files around for a better dev structure