Remove dependencies on folder structure