Moved classes inside their own package.