Added untracked files. Structure tidy up