New setup structure into master