CLSN-6 Create Query Layer

Classes seperated