Final Version - useless files removed