renaming for clarity
renamed for clarity
removed redundant files