new file structure plus validation messages