Refatoring on file layout in data types. Really need to think about how end user will want to include my library into their code base.