final version

-changed names
-deleted files that were not relevant