File Structure Update

some more tweaking (i am very unspecific)