Separate data structure classes into separate directory