Removed and renamed files from original code