complete overhaul, package structure, template