New folder structure and gitnore class