Did some layout stuff

- Added some basic methods to the Intake and Catcher subsystems
- Added the layout for the Intake and Catcher commands
- Reorganised the packages