Reorganized master branch