Added files
Fixed organization a bit