Refactor: Separate Entity directory into subdirectories