Comment fix
Moved some misplaced files