refactoring and initial private layer work

related to IQSS/geoconnect#56