Restructured module folder to have OA and ALW to be inside module folder in order to have layout sit inside its corresponding parent module folder