refactor modules
updated anguar, added more tests