Major code-cleanup

	* Added feature+update
	* Renamed complete folders