Fixed Package Names, improved ResourceUtil
+ Updated Demo to reflect changes