Consistency Update

Apply consistency to directory structure
Flash Update