Swapped layers 1 and 2 for aesthetic reasons.  Added a regular Makefile as a shortcut.