fixing merge
fixing folder structure