Cleanup and restructuring of make-file