Fix icon spacing inside dialogue.
Move class files to own directory.