Update package structure, again
more refactoring of structure + add examples