Some file moving
Code structure refactoring
Fixed references in efficiency tests