typo
FIXME fixed
minor package restructuring