moved classes
renamed icons
removed api package