#16 New folder structure, seperate public and private space
#16 New folder structure, seperate public and private space