started refactoring:

All stubs were added, most of content moved over, some new inner classes
have been done