restructured dev branch for ease of development