Removed useless files, Added structure