cleaned up directory structure and set up makefile for using libraries