Standardised how IDs are set
Fixed plurals in file names so that they follow the naming standards
Formatted code to new coding standard for AMD