Implemented a naming convention for files and layouts