Adding some better structure

- Let's start making this