update folder organization
Merge branch 'master' of https://github.com/tessh/siml-rms