Introduced new structuring and a somewhat-legit packaging of sorts