Created a proper Makefile for desktop debugging

Required a little clean-up and reorganisation of files.