re-structured folders to comply with modx convention.
Merge remote-tracking branch 'origin/master'