Deleted unused code and renamed files