-Fix some minor bug
-Move the Data xml from Resources to Data folder for easy to maintain