made simplify smaller
made some more files