Refactored hierarchy and packaging. Working on Window Application