add make options, change dir structure.