Clean and Testing contains on filter
Moving classes out of the contract project that sould not be part of the project