improved the code quality and added place holder for special folders