updated setup classifiers
fixed setup
refactor and changed module layout