correct build infrastructure
PMO-2561: cleaning up code
PMO-2561: extending code base