major package refactor for increased ease of usability
continued refactor of packages