Code refactor: Implementing Joim Framework 1.5

Refactoring of the base framework, step 1. Most files moved, some old copies still around.