part 2 of cleaning up:
added Icons folder, improved codestructure and allowed looping...