Added file structure, naming and orders