Fixed some build errors caused by @override annotations on toIndex() and removed 'public' from the Storable interface as interfaces in Java can only be public level access.
Renamed NewClientScreenDrawer to ClientScreenDrawer. Deleted the old one.