minor: linting, moved files