File rename
Removing unneeded files
Fixed usings