Removed long package name, switched to default.
Added new empty classes.