rearranged folder structure and other stuff