Refactoring setup with new path/folders