Reorganized:
	- moved and deleted some files