reorganization stage 2 - move stuff out of src