Added icons; restructure of source.