Reorganize structure for better gem management.
Clean up RuboCop concerns.