Updated structure. Placed MVC and inc, into lib folder.