Further refactor and rename of files according to MVC