clean up development branch
restructured dirs
updated tests