Update files structure/namespace