Move icons to folder. Move some code and remove useless comments