Organized classes/packages, more stable functionality