altered file system structure to be a little more 'convenient', also (obviously) modified .gitignore and makefiles