Refractored some packages and mooved some to Demo1 Project