Reworking of App Directory, Go Vet some Files