Moving data structures into lib folder to beign writing tests for each