reorganised build folders