Move modules into "modules" dir