Code Refactoring, including abstracting data outside of the x11
Side of the codebase.