Adapt file structure for 3.1
Merge branch 'master' of github.com:phpbb/area51