reorganized folders, added icons