move to package based structure, prettier imports