Restructuring folders and naming conventions.