Repository re-structured, development managed with branches