Moved basic Data structs to own folder