Big refactorings / changes on the way. Application structure is coming together.