unifying development and master folders