Added Makefile for angled desk enclosure, refactoring