Fix #175 - Updated and corrected all strings in concordance with latest chriteria

Structure is also updated, breaking into logical parts and adding comments naming sections.