Removed unnecesarry files, merged improvements