first working version, messed up folder structure
moved errthing