Took care of couple of warnings and rearranged package structure. Made sure tht app runs without regression