Spring Cleaning

Just deleted +  renamed + other changes