Minor internal refactoring (less packages); added comments and ToDos...