Major change in structure..
changed a lot of files