Rearrange files and fix tests for new paths.