Rework, simplyfications and added Local package