change link order from complex to simple
define test class points
rename include and add base impl file
rename includes for library