simplify structure and makefile, add outline