Rearranged library and began adding Logging

rearranged library started adding Log