Simplified make structure