Organize classes
Icons update, Adapter configs