Remake of RCPL to use MVC principles