Launch fail fix - corrected image directory
Removing conflicted copies from images directory, enabling HD
resolution.
Started refactoring of ugly methods.
Added some TODOs
Merge branch 'PROZ-project' into RC
Removed some comments