Moved some files

Looks nicer I think?