Moved entities into their own subdirectory