gradle cleanup and new common data project added