Move modules into proper hierarchy