[Change] Changed directory structure and module namings.