folders cleanup and bug fixes