Redo Project

Clean up of files