New folder structure, more base system stuff