cleaned up some old code and moved files around - BREAKING CHANGE