Moved files around

Moved a bit