moved generated base and search models into folders, kept suffix for easier auto-completion usage