deleted 2 files, made more organized