Cleaning up the code
Starting to create the Drawable classes