Fixed files structure and removed thing

Fixed files structure and removed thing