Made things neater.

More base classes. Full Idea workspace