I don't quite understand, you would like me to change from ```merit/base/files``` to ```base/merit/files``` ?