Some table shortenning
Some table moving arounds
More cleanup
Merge pull request #129 from mshahriarinia/master

cleanup