fixed dependencies, structs still broken