Additional flash restructuring/refactoring