Moving classes to data package
Created BundleID