Refactor of ProjectLoader class