Readme update, test and refactor
new layout, FIX
Merge branch 'develop' into virtual-less