Re-arranged modules into a single directory.