Fixing folder structure

Still fixing, but initial commit of this