Split out files, added icons