correct folders name and fix construct