Restructure file locations.
Merge branch 'master' of https://github.com/thasenpusch/simplix