Lots of reorganization. Added Swell logging framework. Finish data import with adapter