Some code improvement

*revert to original folder structure
*rewrited make files
*clean up files