Moved some entities

not functional yet