change to maven filestructure, daeactivated a few tests