some CS tweaks and change of structure of build/phing process.