changed folder structure
fixed screwed up things again
fixed screwed up