started to re-write.
new file/folder structure