updated folder layout
changed some stuff