Merge pull request #53 from psywhale/master

fixed structure
Merge branch 'master' into MOODLE_26_STABLE