Update naming convention
Delete unused files