modify modules layout
Merge pull request #1 from mattoufoutu/master

modify modules layout