Provide a better, more streamlined structure for the project