Moving icon files to be a component
Moving more files out of general