File and class reorganisation with the intention of progressively moving towards a MVC Pattern.