rename folder "controller" to "modules"
minor other changes