major module and folder restructure. going somewhere with this
small module tweeks