Add subfoldes for includes and implement dual background