System structure v2
Merge branch 'master' of https://github.com/ArniXXX/AlexaCMS