Moved some files to the correct package