Redo project structure + another test file