Re arrange some schema related files