Makefile, build instructions and folder reorganization