more modular structure
reverting master branch to scientific div version