Merge pull request #8 from cbos-team/master

position detection of modules and layout improvement