Fixed include locations and moved makefile into source folder