Started work on minimizer, renamed some files