Reorganized build rules