Read files into a list on the project object plus some refactoring