Migrated build system to support directory changes