formatting, deleted empty files
reorganized some code