add linting and rspec tests
renaming/ordering modules