Refactored build system
markdown