Changed namespaces, updated folder structure, implemented inputstreams to access data,