Moved some files and fixed un resolved external Error