Revert "Merge pull request #5 from xtol-sd/refactoring"

This reverts commit e9cd3877370ae588a430f4ceaa11c775a613cc21, reversing
changes made to eb53ce9e5cd43540e87ba7b802675c3bb63148bf.

revert to before merge because we were having requirements bugs due to merge with testing suite