Refactored generation build properties and rearranged psake targets