Moved Entities to their subfolder