Further simplified filePathMappers, adding extra information to compileMap, general refactoring, increased test coverage.