Cleaned up directory structure and remade makefile.