Placed Dani's modules on develop branch