Fixed paths for new setup