started major refactor

refactoring begun, better structure, better classes, less clutter,
better notes