Adopt folder structure to namespace changes