Move modules into their own folders