Move systems to separate folder