Updated directory naming structure and module formatting