Reorganizing and linting