Readded makefile (which is now broken) and restructed files into folders