restructured, moved classes to own files