use new directory structure: split modules into each part