Improved makefile for building
Organized io files better