moved files and corrected inference tests
restructure