More moving and remove useless Main class.