added new public modules structure