Added repository and restructured queryable + more