Reorganized make structure