Refactor some referential classes into subfolders