Restructure file tree for cleaner module naming
Some tests up, a skeleton in place