Moved some file around for easier solutions