move modules into separate dir