finished overhaul and modulization of base project