A working (TM) version of package with restructure