Build logic and folder structure improved