moved controllers inside drawable
removed some more unusued classes