Minor tweak

Moved sys contents into various sub directories