Reorganize existing code - extract classes to separate files
Initial tests, minor changes in existing code