Implement saarinen them and clean source directory