Split code and and removed definition file.