rearranged files
stripping down the-sh
simplifications