delete orphaned files
fix naming issue
delete renamed files
refine/fix tests
fix imports
adjust imports mainly