Solved p01 and project refactoring