restructured project to include folders; modded makefile appropriately