reorganized build