Structure changes

	* Removed old classes of view controller
	* New structure on controler dir