Removed folders and some renaming