Structuring updates
Structuring updates

- Restructured code to only use joysticks in the main class.
- Added more finals