Refactored

Application has been refactored and is now ready to be presented to the
customer. Commenting is now finished.