Restructured and cleaned code

added draw and update to all, and cleaned up a bit