Major PHP file cleanup / rename