started modularization; added build ordering fw